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

Tree
Accordion

Stats

Commits this week: 0

Total Committers:	13
Last Commit:	24 Feb 16
Commits this week:	0
Total Lines of Code (LoC):	0
Net change in LoC this week:	0

Commit Activity

last updated a few seconds ago

Constraints

Constraints: committers

Committer:

Log Comment:

Constraints: files

File Extension:

File Name:

Constraints: dates

Start Date:

End Date:

Changeset 29226 is being indexed.

Wednesday 14 Oct 2020

7:35 下午

shuyongfu

More
29226
changed 1 file
V4.1.0

解决:DGSDBZXYY-102 自定义装配的消毒物品（成人呼吸囊）发货时提示材料与申请单中的材料不一致的问题(自定义装配时的申请科室值为空、包定义是否限制发货科室为是的发货场景)

- ?
./main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java
- History
- Source
- Diff
./main/.../InvoiceOptimizeManagerImpl.java

2:46 下午

jason

More
29216
changed 1 file
V4.1.0

解决jira问题：HBSXKYY-37 河北省胸科医院批量打印发货单的发货人与实际不符

- ?
./main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
- History
- Source
- Diff
./main/java/.../InvoiceManagerImpl.java

Tuesday 13 Oct 2020

1:50 下午

jason

More
29207
changed 2 files
V4.1.0

解决jira问题：DGSDBZXYY-83 东莞市东部中心医院外部代理灭菌包，器械包信息里面的装配记录的配包人没有显示出来

- ?
./main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
- History
- Source
- Diff
./main/java/com/.../action/InvoiceAction.java
… 1 more file in changeset.

Tuesday 29 Sep 2020

6:13 下午

jason

More
29139
changed 1 file
V4.1.0

解决jira问题：SZSZLYY-47深圳市肿瘤医院发货管理搜索功能加强

- ?
./main/java/com/forgon/disinfectsystem/invoicemanager/dwr/table/InvoiceTableManager.java
- History
- Source
- Diff
./main/java/.../table/InvoiceTableManager.java

Monday 28 Sep 2020

3:51 下午

shuyongfu

More
29126
changed 3 files
V4.1.0

解决:PYQZYY-193 外一科和西区手术室退货棉签（独立），条码0111049103，保存时提示库存小于0，无法保存。

一次性物品发货功能小调整(同一科室同一个一次性物品定义的物品有多张申请单同时发的情况)、增加和补充相关的代码注释

- ?
./main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java
- History
- Source
- Diff
./main/.../InvoiceOptimizeManagerImpl.java
… 2 more files in changeset.

Wednesday 23 Sep 2020

4:39 下午

shuyongfu

More
29091
changed 1 file
V4.1.0

处理:JMSZXYY-89 自定义器械包申请单增加是否回收清洗选择(解决不回收的自定义器械包发货不了的问题)

- ?
./main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java
- History
- Source
- Diff
./main/.../InvoiceOptimizeManagerImpl.java

Thursday 17 Sep 2020

2:58 下午

jason

More
29011
changed 1 file
V4.1.0

解决jira问题：SZSZLYY-47深圳市肿瘤医院发货管理搜索功能加强

- ?
./main/java/com/forgon/disinfectsystem/invoicemanager/dwr/table/InvoiceTableManager.java
- History
- Source
- Diff
./main/java/.../table/InvoiceTableManager.java

Thursday 10 Sep 2020

2:43 下午

shuyongfu

More
28943
changed 1 file
V4.1.0

解决:HZSRMYY-56 申请科室为空的包，发货时不限制其发货科室(解决自定义发货发不出申请科室为空的包)

- ?
./main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
- History
- Source
- Diff
./main/java/.../InvoiceManagerImpl.java

Wednesday 09 Sep 2020

7:30 下午

zc.li

More
28939
changed 1 file
V4.1.0

SSTS-191：辅助发货的待发货器械包列表增加限制发货科室的限制

- ?
./main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
- History
- Source
- Diff
./main/java/.../InvoiceManagerImpl.java

4:30 下午

zc.li

More
28936
changed 1 file
V4.1.0

SSTS-191：辅助发货的待发货器械包列表增加限制发货科室的限制

- ?
./main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
- History
- Source
- Diff
./main/java/.../InvoiceManagerImpl.java

4:26 下午

zc.li

More
28935
changed 1 file
V4.1.0

SSTS-191：辅助发货的待发货器械包列表增加限制发货科室的限制

- ?
./main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
- History
- Source
- Diff
./main/java/.../InvoiceManagerImpl.java

3:54 下午

zc.li

More
28934
changed 1 file
V4.1.0

SSTS-191：辅助发货的待发货器械包列表增加限制发货科室的限制

- ?
./main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
- History
- Source
- Diff
./main/java/.../InvoiceManagerImpl.java

1:41 下午

shuyongfu

More
28933
changed 1 file
V4.1.0

解决:HZSRMYY-56 申请科室为空的包，发货时不限制其发货科室

- ?
./main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java
- History
- Source
- Diff
./main/.../InvoiceOptimizeManagerImpl.java

Wednesday 26 Aug 2020

9:41 下午

shuyongfu

More
28842
changed 1 file
V4.1.0

解决:HZSRMYY-50 自定义发货保存时，增加检查是否满足所有物品的限制发货科室的要求

- ?
./main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
- History
- Source
- Diff
./main/java/.../InvoiceManagerImpl.java

7:19 下午

shuyongfu

More
28837
changed 1 file
V4.1.0

解决:HZSRMYY-50 自定义发货保存时，增加检查是否满足所有物品的限制发货科室的要求

- ?
./main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
- History
- Source
- Diff
./main/java/.../InvoiceManagerImpl.java

Monday 24 Aug 2020

3:59 下午

shuyongfu

More
28822
changed 1 file
V4.1.0

解决:一次性物品发货时,新插入的一次性物品库存表数据的仓库名称与五笔码的值相反的处理

- ?
./main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java
- History
- Source
- Diff
./main/.../InvoiceOptimizeManagerImpl.java

Friday 14 Aug 2020

8:58 下午

zc.li

More
28757
changed 2 files
V4.1.0

解决追加需求:ZSYY-273;消毒供应中心未完成工作功能的优化

- ?
./main/java/com/forgon/disinfectsystem/invoicemanager/vo/ToBeShippedGoodsVO.java
- History
- Source
- Diff
./main/java/com/.../vo/ToBeShippedGoodsVO.java
… 1 more file in changeset.

Thursday 13 Aug 2020

6:41 下午

shuyongfu

More
28739
changed 1 file
V4.1.0

解决:ASSFDZLYY-33 同一种高值耗材扫描多个数量无法提交

发货一次性物品高值耗材发货后库存不一致问题:同一一次性物品定义且同一批次下的多个高值耗材发货后,批次库存与高值耗材实例数量不一致

- ?
./main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java
- History
- Source
- Diff
./main/.../InvoiceOptimizeManagerImpl.java

11:17 上午

shuyongfu

More
28727
changed 1 file
V4.1.0

处理:ASSZDFY-77 InvoiceItem表中含有tousseType字段为空的数据，导致运作监控发货无法查询出此类数据

- ?
./main/java/com/forgon/disinfectsystem/invoicemanager/service/ExpressInvoiceManagerImpl.java
- History
- Source
- Diff
./main/java/.../ExpressInvoiceManagerImpl.java

Wednesday 12 Aug 2020

3:24 下午

shuyongfu

More
28714
changed 1 file
V4.1.0

解决:PYQZYY-185 ORACLE数据库发货不追溯的消毒物品时提示库存不足

- ?
./main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
- History
- Source
- Diff
./main/java/.../InvoiceManagerImpl.java

Tuesday 11 Aug 2020

8:18 下午

shuyongfu

More
28706
changed 1 file
V4.1.0

处理复杂场景的一次性物品发货的问题，主要针对复大肿瘤几个问题(ASSFDZLYY-30,ASSFDZLYY-30)

- ?
./main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java
- History
- Source
- Diff
./main/.../InvoiceOptimizeManagerImpl.java

Monday 10 Aug 2020

7:08 下午

shuyongfu

More
28688
changed 1 file
V4.1.0

处理:ASSFDZLYY-31 核算月报与明细核算月报中“四病区”的7月22号当天一次性物品结算总金额相差7元

处理一次性物品发货后invoice,invoiceItem,DiposableGoodsItem三个表的数量和价格不一致的问题

- ?
./main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java
- History
- Source
- Diff
./main/.../InvoiceOptimizeManagerImpl.java

5:43 下午

zc.li

More
28684
changed 5 files
V4.1.0

解决ZSYY-273：消毒供应中心未完成工作功能的优化

- ?
./main/java/com/forgon/disinfectsystem/invoicemanager/vo/ToBeShippedGoodsVO.java
- History
- Source
./main/java/com/.../vo/ToBeShippedGoodsVO.java
… 4 more files in changeset.

11:48 上午

zc.li

More
28673
changed 1 file
V4.1.0

无用代码删除

- ?
./main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
- History
- Source
- Diff
./main/java/.../InvoiceManagerImpl.java

Wednesday 05 Aug 2020

7:40 下午

shuyongfu

More
28633
changed 1 file
V4.1.0

解决聚合包发货后状态还是已灭菌，导致还能再次该聚合包发货的问题

- ?
./main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java
- History
- Source
- Diff
./main/.../InvoiceOptimizeManagerImpl.java

5:45 下午

shuyongfu

More
28630
changed 1 file
V4.1.0

处理:ASSDGSZYY-84 固定条码的敷料有已灭菌的数量，但发货时提示库存不足

- ?
./main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java
- History
- Source
- Diff
./main/.../InvoiceOptimizeManagerImpl.java

Tuesday 04 Aug 2020

3:53 下午

shuyongfu

More
28613
changed 1 file
V4.1.0

处理:PYQZYY-178

7月31日申请了一次性物品：一次性灭菌棉垫，数量180，发货时第一次发了60，第二次发了120，现在发货计划里显示还有120未发

发货时检索要发货的申请项增加对申请单的处理科室编码为当前用户所在科室的过滤条件

- ?
./main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java
- History
- Source
- Diff
./main/.../InvoiceOptimizeManagerImpl.java

3:41 下午

shuyongfu

More
28611
changed 1 file
V4.1.0

处理:ASSFDZLYY-28 PC与PDA端一次性物品和高值耗材无法同时发货

jdk集合操作的异常问题.一个list只能被remove一次,再remove一次就报java.util.ConcurrentModificationException

- ?
./main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java
- History
- Source
- Diff
./main/.../InvoiceOptimizeManagerImpl.java

Thursday 30 Jul 2020

10:03 上午

jason

More
28556
changed 6 files
V4.1.0

解决jira问题：SZSDSRMYY-13 深圳市第三人民医院已退货的物品，在重新打印发货单时，不要继续打印

- ?
./main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
- History
- Source
- Diff
./main/java/com/.../action/InvoiceAction.java
- ?
./main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
- History
- Source
- Diff
./main/java/.../InvoiceManagerImpl.java
… 4 more files in changeset.

Saturday 25 Jul 2020

2:20 下午

shuyongfu

More
28529
changed 1 file
V4.1.0

处理一张外来器械申请单申请多种外来器械包时,其中的一种外来器械包拆包后部分发货报错的问题

- ?
./main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java
- History
- Source
- Diff
./main/.../InvoiceOptimizeManagerImpl.java

src

Line History

Stats

Commits this week: 0

Commit Activity

52 week commits volume

Commits by day

Commits by hour

Commit calendar

Most active committers (90 days)

shuyongfu

jason

jason

jason

shuyongfu

shuyongfu

jason

shuyongfu

zc.li

zc.li

zc.li

zc.li

shuyongfu

shuyongfu

shuyongfu

shuyongfu

zc.li

shuyongfu

shuyongfu

shuyongfu

shuyongfu

shuyongfu

zc.li

zc.li

shuyongfu

shuyongfu

shuyongfu

shuyongfu

jason

shuyongfu