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

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 30612 is being indexed.

Tuesday 23 Feb 2021

9:06 下午

jason

More
30612
changed 4 files
V4.1.0

解决jira问题：GZS12RMYY-37 发货管理发货单打印前部分物品退货后再打印发货单已打印状态优化

- ?
./com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../InvoiceManagerImpl.java
… 3 more files in changeset.

Thursday 18 Feb 2021

10:00 上午

shuyongfu

More
30562
changed 1 file
V4.1.0

解决:PYQZYY-196 一张外部代理灭菌单上的同一种包，有2种不同的包装类型出现两行的时候，会导致其中一行的包没有发货计划

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

Monday 01 Feb 2021

4:07 下午

shuyongfu

More
30467
changed 1 file
V4.1.0

解决:ZSLY-376 中山六院，中大六院发货管理批量打印发货单的速度比较慢

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

10:26 上午

shuyongfu

More
30462
changed 1 file
V4.1.0

解决:SSTS-295 发货一次性物品，涉及多个批次的，点击保存并打印的按钮，发货单状态为部分打印

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

Tuesday 26 Jan 2021

9:28 下午

shuyongfu

More
30412
changed 1 file
V4.1.0

解决:SSTS-292 一次性物品发货，同时使用固定条码和批次条码发货，只发货了固定条码的数量

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

8:48 下午

zc.li

More
30410
changed 1 file
V4.1.0

优化KLMYSRMYY-8：洁定清洗机和灭菌炉接口开发（1.灭菌炉接口参数图取值）

- ?
./com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
- History
- Source
- Diff
./com/forgon/.../action/InvoiceAction.java

4:22 下午

shuyongfu

More
30399
changed 1 file
V4.1.0

解决:SSTS-287 自定义发货，在“扫描条码”筐中扫描科室条码，会将科室条码扫进器械包栏，保存时提示,参数sendAmount有误，不能小于等于0，实际值：sendAmount = 0

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

4:05 下午

shuyongfu

More
30397
changed 1 file
V4.1.0

解决:SSTS-292 一次性物品发货，同时使用固定条码和批次条码发货，只发货了固定条码的数量

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

Monday 25 Jan 2021

4:21 下午

shuyongfu

More
30378
changed 4 files
V4.1.0

解决:KLMYSRMYY-5 PC端支持一次性物品一键扫描发货

- ?
./com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
- History
- Source
- Diff
./com/forgon/.../action/InvoiceAction.java
… 3 more files in changeset.

Saturday 23 Jan 2021

12:48 下午

shuyongfu

More
30369
changed 1 file
V4.1.0

解决:CDSLQYQYYY-84 器械包规格大小统计报表、明细核算月报、核算月报、消毒供应中心工作量统计报表的数量不一致的问题

处理器械包定义的材料数量为NULL的问题

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

Wednesday 20 Jan 2021

7:05 下午

shuyongfu

More
30335
changed 1 file
V4.1.0

解决:CDSLQYQYYY-84 器械包规格大小统计报表、明细核算月报、核算月报、消毒供应中心工作量统计报表的数量不一致的问题

发货项的材料数量由对应所发的包实例的材料数量之和改为所发的包实例的包定义的材料数量

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

Sunday 10 Jan 2021

7:42 下午

jason

More
30177
changed 9 files
V4.1.0

解决jira问题：GDSZYY-57 科研项目耗材申领（一次性物品申领）功能开发

- ?
./com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../InvoiceManagerImpl.java
… 8 more files in changeset.

Friday 08 Jan 2021

6:43 下午

shuyongfu

More
30166
changed 1 file
V4.1.0

解决:GDSZYY-57 科研项目耗材申领（一次性物品申领）功能开发

科研项目接口整合,去掉老的api方法,改调用新的api方法

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

Tuesday 05 Jan 2021

11:07 上午

shuyongfu

More
30106
changed 7 files
V4.1.0

解决:GDSZYY-57 科研项目耗材申领（一次性物品申领）功能开发

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

Thursday 31 Dec 2020

10:11 上午

shuyongfu

More
30075
changed 18 files
V4.1.0

解决:GDSZYY-57 科研项目耗材申领（一次性物品申领）功能开发

科研接口底层实现及中山眼科与省中医两个项目的业务层的分离

- ?
./com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../InvoiceManagerImpl.java
… 17 more files in changeset.

Tuesday 29 Dec 2020

3:51 下午

shuyongfu

More
30043
changed 1 file
V4.1.0

解决:ASSFDZLYY-43 扫描一次性物品（非高值）条码提交后系统提示“所扫描的物品条码未找到对应的条码对象”

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

2:20 下午

jason

More
30039
changed 3 files
V4.1.0

解决jira问题：GGSRMYY-142 丢失报损，退货记录，材料发货的结算科室优化(材料发货增加结算科室)

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

10:30 上午

jason

More
30035
changed 6 files
V4.1.0

解决jira问题：GGSRMYY-142 丢失报损，退货记录，材料发货的结算科室优化

- ?
./com/forgon/disinfectsystem/invoicemanager/action/MaterialInvoiceAction.java
- History
- Source
- Diff
./com/forgon/.../MaterialInvoiceAction.java
… 5 more files in changeset.

Thursday 24 Dec 2020

2:06 下午

terrykwan

More
29970
changed 1 file
V4.1.0

丰富异常情况的提示信息

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

Wednesday 23 Dec 2020

7:49 下午

shuyongfu

More
29959
changed 1 file
V4.1.0

解决:JYSRMYY-20 辅助发货灭菌完没有显示待发物品

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

Monday 30 Nov 2020

5:26 下午

zc.li

More
29709
changed 10 files
V4.1.0

解决：DGSDBZXYY-123。发货物品统计月报的外来器械包没有按包来统计而是按包内材料数量来统计

- ?
./com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../InvoiceManagerImpl.java
… 9 more files in changeset.

2:32 下午

shuyongfu

More
29704
changed 3 files
V4.1.0

解决:1.聚合包大包发货及非大包发货的pc与Pda端功能

2.SSTS-246 打开一个科室的发货计划，有A、B两种一次性物品，A物品通过扫固定条码加载出来，B物品通过扫批次条码加载出来，保存发货后，A物品没有发货成功，还显示在发货计划列表上

3.聚合包内含有不追溯的包，配置为不按大包发货的发货场景

4.发货代码整合优化

- ?
./com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java
- History
- Source
- Diff
./com/.../InvoiceOptimizeManagerImpl.java
- ?
./com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../InvoiceManagerImpl.java
… 1 more file in changeset.

Wednesday 18 Nov 2020

3:02 下午

shuyongfu

More
29588
changed 1 file
V4.1.0

解决:ASSDGSZYY-89 含植入物器械包灭菌监测及发货情况报表“常规发货”、“紧急发货”字段值未正确显示的问题

sql语句换行时末尾增加空格

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

10:35 上午

shuyongfu

More
29586
changed 1 file
V4.1.0

解决:ASSDGSZYY-89 含植入物器械包灭菌监测及发货情况报表“常规发货”、“紧急发货”字段值未正确显示的问题

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

Monday 16 Nov 2020

1:41 下午

jason

More
29577
changed 1 file
V4.1.0

解决jira问题：GGSRMYY-140 贵港市人民医院发货单的消毒物品发货物品明细，已打印列状态显示有问题(鼠标悬浮框的发货物品列表，同一个物品只需要显示一行)

- ?
./com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
- History
- Source
- Diff
./com/forgon/.../action/InvoiceAction.java

Wednesday 11 Nov 2020

4:53 下午

shuyongfu

More
29539
changed 3 files
V4.1.0

解决:SZYK-10 自定义发货增加支持扫灭菌筐发货(针对灭菌篮筐里装载有不追溯的包的处理)

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

Monday 09 Nov 2020

6:55 下午

shuyongfu

More
29520
changed 3 files
V4.1.0

解决:SZYK-10 自定义发货增加支持扫灭菌筐发货

- ?
./com/forgon/disinfectsystem/invoicemanager/service/InvoiceManager.java
- History
- Source
- Diff
./com/forgon/.../service/InvoiceManager.java
- ?
./com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../InvoiceManagerImpl.java
… 1 more file in changeset.

Wednesday 04 Nov 2020

2:47 下午

shuyongfu

More
29475
changed 1 file
V4.1.0

解决:ZSYKZX-139 在pda上选择今天的发货任务进行发货，但发的并不是今天的申请单，今天的申请单仍显示待发货

去年多余无用的代码

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

2:03 下午

shuyongfu

More
29474
changed 1 file
V4.1.0

解决:ZSYKZX-139 在pda上选择今天的发货任务进行发货，但发的并不是今天的申请单，今天的申请单仍显示待发货

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

Friday 30 Oct 2020

9:14 下午

jason

More
29444
changed 1 file
V4.1.0

解决jira问题：GZS12RMYY-35 广州市第十二人民医院数据问题：发货管理的批量打印发货单，内一科批量打印不出单据。

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

java

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)

jason

shuyongfu

shuyongfu

shuyongfu

shuyongfu

zc.li

shuyongfu

shuyongfu

shuyongfu

shuyongfu

shuyongfu

jason

shuyongfu

shuyongfu

shuyongfu

shuyongfu

jason

jason

terrykwan

shuyongfu

zc.li

shuyongfu

shuyongfu

shuyongfu

jason

shuyongfu

shuyongfu

shuyongfu

shuyongfu

jason