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

10:19 上午

yanweining

More
22252
changed 18 files
V4.1.0

高值耗材：高值耗材入库，发票修改

- ?
./src/main/java/com/forgon/disinfectsystem/expensiveGoods/util/ExpensiveGoodsGodownEntryUtil.java
- History
- Source
- Diff
./src/.../ExpensiveGoodsGodownEntryUtil.java
- ?
./src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsGodownEntryAction.java
- History
- Source
- Diff
./src/.../ExpensiveGoodsGodownEntryAction.java
- ?
./src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsBillAction.java
- History
- Source
- Diff
./src/main/.../ExpensiveGoodsBillAction.java
- ?
./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManager.java
- History
- Source
- Diff
./src/.../ExpensiveGoodsGodownEntryManager.java
- ?
./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsBillManagerImpl.java
- History
- Source
- Diff
./src/.../ExpensiveGoodsBillManagerImpl.java
- ?
./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
- History
- Source
- Diff
./src/.../ExpensiveGoodsGodownEntryManagerImpl.java
… 12 more files in changeset.

9:42 下午

liuliben

More
22193
changed 1 file
V4.1.0

修改高值耗材授权同级别代理一件物品不能给多个下级代理授权

- ?
./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsAuthorizationManagerImpl.java
- History
- Source
- Diff
./src/.../ExpensiveGoodsAuthorizationManagerImpl.java

2:46 下午

jeffli

More
22158
changed 6 files
V4.1.0

一键退库功能调整

- ?
./src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsGodownEntryAction.java
- History
- Source
- Diff
./src/.../ExpensiveGoodsGodownEntryAction.java
- ?
./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManager.java
- History
- Source
- Diff
./src/.../ExpensiveGoodsGodownEntryManager.java
- ?
./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
- History
- Source
- Diff
./src/.../ExpensiveGoodsGodownEntryManagerImpl.java
… 3 more files in changeset.

10:25 上午

yanweining

More
22145
changed 1 file
V4.1.0

高值耗材：高值耗材发票优化

- ?
./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsBillManagerImpl.java
- History
- Source
- Diff
./src/.../ExpensiveGoodsBillManagerImpl.java

10:28 下午

shuyongfu

More
22143
changed 1 file
V4.1.0

解决问题:高值耗材录使用记录，录两个一样高值耗材定义的物品，库存只扣减1，删掉两个物品后，库存也只增加1

- ?
./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsStockManagerImpl.java
- History
- Source
- Diff
./src/.../ExpensiveGoodsStockManagerImpl.java

9:52 下午

niutou_ren

More
22142
changed 1 file
V4.1.0

修改ExpensiveGoodsManager类中的函数名（getDisposableGoodsTypeTreeJson() -> getExpensiveGoodsTypeTreeJson()）

- ?
./src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsStockAction.java
- History
- Source
- Diff
./src/main/.../ExpensiveGoodsStockAction.java

9:29 下午

niutou_ren

More
22141
changed 4 files
V4.1.0

1、修改错误的函数名

2、调整高值耗材定义界面

- ?
./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java
- History
- Source
- Diff
./src/main/.../ExpensiveGoodsManagerImpl.java
- ?
./src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsAction.java
- History
- Source
- Diff
./src/main/.../ExpensiveGoodsAction.java
- ?
./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManager.java
- History
- Source
- Diff
./src/main/.../ExpensiveGoodsManager.java
… 1 more file in changeset.

6:06 下午

yanweining

More
22136
changed 7 files
V4.1.0

高值耗材：高值耗材入库修改

- ?
./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsBillManagerImpl.java
- History
- Source
- Diff
./src/.../ExpensiveGoodsBillManagerImpl.java
- ?
./src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsBillAction.java
- History
- Source
- Diff
./src/main/.../ExpensiveGoodsBillAction.java
- ?
./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsBillManager.java
- History
- Source
- Diff
./src/main/.../ExpensiveGoodsBillManager.java
- ?
./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
- History
- Source
- Diff
./src/.../ExpensiveGoodsGodownEntryManagerImpl.java
… 3 more files in changeset.

5:49 下午

jeffli

More
22135
changed 1 file
V4.1.0

优化提示信息

- ?
./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
- History
- Source
- Diff
./src/.../ExpensiveGoodsGodownEntryManagerImpl.java

5:37 下午

jeffli

More
22134
changed 2 files
V4.1.0

已退库的高值耗材不允许再次退库

- ?
./src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsGodownEntryAction.java
- History
- Source
- Diff
./src/.../ExpensiveGoodsGodownEntryAction.java
- ?
./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
- History
- Source
- Diff
./src/.../ExpensiveGoodsGodownEntryManagerImpl.java

2:33 下午

jeffli

More
22129
changed 1 file
V4.1.0

解决bug，退库后库存没有减少

- ?
./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
- History
- Source
- Diff
./src/.../ExpensiveGoodsGodownEntryManagerImpl.java

11:38 上午

chenjiaru

More
22125
changed 2 files
V4.1.0

高值耗材申请单功能部分代码的提交(预入库之后产生外来器械包申请单)

- ?
./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManager.java
- History
- Source
- Diff
./src/.../ExpensiveGoodsGodownEntryManager.java
- ?
./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
- History
- Source
- Diff
./src/.../ExpensiveGoodsGodownEntryManagerImpl.java

9:47 下午

jeffli

More
22118
changed 1 file
V4.1.0

修改一键退库bug

- ?
./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
- History
- Source
- Diff
./src/.../ExpensiveGoodsGodownEntryManagerImpl.java

9:35 下午

chenjiaru

More
22117
changed 1 file
V4.1.0

高值耗材申请单功能部分代码的提交(预入库之后产生外来器械包申请单)

- ?
./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
- History
- Source
- Diff
./src/.../ExpensiveGoodsGodownEntryManagerImpl.java

9:19 下午

jeffli

More
22116
changed 1 file
V4.1.0

一键退库改为未使用的都可以退

- ?
./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
- History
- Source
- Diff
./src/.../ExpensiveGoodsGodownEntryManagerImpl.java

9:17 下午

niutou_ren

More
22115
changed 2 files
V4.1.0

修改高值耗材定义bug

1、删除入库的高值耗材型号时报错，添加判断，如果该高值耗材型号已入库，则不允许删除

2、高值耗材定义界面中，添加多个型号时，判断逻辑修复

- ?
./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java
- History
- Source
- Diff
./src/main/.../ExpensiveGoodsManagerImpl.java
… 1 more file in changeset.

8:44 下午

chenjiaru

More
22112
changed 3 files
V4.1.0

高值耗材申请单功能部分代码的提交(预入库之后产生外来器械包申请单)

- ?
./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
- History
- Source
- Diff
./src/.../ExpensiveGoodsGodownEntryManagerImpl.java
… 2 more files in changeset.

5:25 下午

jeffli

More
22098
changed 1 file
V4.1.0

优化保存高值耗材定义的代码

- ?
./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java
- History
- Source
- Diff
./src/main/.../ExpensiveGoodsManagerImpl.java

5:05 下午

yanweining

More
22097
changed 6 files
V4.1.0

高值耗材：高值耗材发票

- ?
./src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsBillAction.java
- History
- Source
- Diff
./src/main/.../ExpensiveGoodsBillAction.java
- ?
./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsBillManagerImpl.java
- History
- Source
- Diff
./src/.../ExpensiveGoodsBillManagerImpl.java
- ?
./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsBillManager.java
- History
- Source
- Diff
./src/main/.../ExpensiveGoodsBillManager.java
… 3 more files in changeset.

4:49 下午

yanweining

More
22095
changed 2 files
V4.1.0

高值耗材：高值耗材入库

- ?
./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
- History
- Source
- Diff
./src/.../ExpensiveGoodsGodownEntryManagerImpl.java
… 1 more file in changeset.

4:42 下午

niutou_ren

More
22094
changed 6 files
V4.1.0

在高值耗材定义（页面）中，添加型号

- ?
./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManager.java
- History
- Source
- Diff
./src/main/.../ExpensiveGoodsManager.java
- ?
./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java
- History
- Source
- Diff
./src/main/.../ExpensiveGoodsManagerImpl.java
- ?
./src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsAction.java
- History
- Source
- Diff
./src/main/.../ExpensiveGoodsAction.java
… 3 more files in changeset.

8:51 下午

jeffli

More
22075
changed 6 files
V4.1.0

高值耗材退库增加型号的处理

自购入库，目前不需要做退库

预入库，退库时，库存直接减掉（未发货之前，从设备科扣减。发货后，从临床扣减）

- ?
./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryItemManagerImpl.java
- History
- Source
- Diff
./src/.../ExpensiveGoodsGodownEntryItemManagerImpl.java
- ?
./src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsGodownEntryAction.java
- History
- Source
- Diff
./src/.../ExpensiveGoodsGodownEntryAction.java
- ?
./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
- History
- Source
- Diff
./src/.../ExpensiveGoodsGodownEntryManagerImpl.java
… 3 more files in changeset.

7:52 下午

jeffli

More
22064
changed 4 files
V4.1.0

高值耗材退库增加型号的处理

自购入库，目前不需要做退库

预入库，退库时，库存直接减掉（未发货之前，从设备科扣减。发货后，从临床扣减）

- ?
./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
- History
- Source
- Diff
./src/.../ExpensiveGoodsGodownEntryManagerImpl.java
- ?
./src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsGodownEntryAction.java
- History
- Source
- Diff
./src/.../ExpensiveGoodsGodownEntryAction.java
… 2 more files in changeset.

7:30 下午

niutou_ren

More
22061
changed 4 files
V4.1.0

修改在显示库存时，判断当前登录用户是否为高值耗材处理科室用户

- ?
./src/main/java/com/forgon/disinfectsystem/expensiveGoods/dwr/table/ExpensiveGoodsTableManager.java
- History
- Source
- Diff
./src/main/.../ExpensiveGoodsTableManager.java
… 3 more files in changeset.

5:50 下午

yanweining

More
22054
changed 3 files
V4.1.0

高值耗材：高值耗材实例添加结算状态字段

- ?
./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
- History
- Source
- Diff
./src/.../ExpensiveGoodsGodownEntryManagerImpl.java
… 2 more files in changeset.

3:20 下午

yanweining

More
22047
changed 4 files
V4.1.0

高值耗材：高值耗材入库修改

- ?
./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
- History
- Source
- Diff
./src/.../ExpensiveGoodsGodownEntryManagerImpl.java
- ?
./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsBillManagerImpl.java
- History
- Source
- Diff
./src/.../ExpensiveGoodsBillManagerImpl.java
… 2 more files in changeset.

1:59 下午

yanweining

More
22042
changed 2 files
V4.1.0

高值耗材：高值耗材入库，发票修改

- ?
./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsBillManagerImpl.java
- History
- Source
- Diff
./src/.../ExpensiveGoodsBillManagerImpl.java
- ?
./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
- History
- Source
- Diff
./src/.../ExpensiveGoodsGodownEntryManagerImpl.java

1:50 下午

liuliben

More
22041
changed 3 files
V4.1.0

修改高值耗材保存验证

- ?
./src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsAuthorizationAction.java
- History
- Source
- Diff
./src/.../ExpensiveGoodsAuthorizationAction.java
- ?
./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsAuthorizationManagerImpl.java
- History
- Source
- Diff
./src/.../ExpensiveGoodsAuthorizationManagerImpl.java
- ?
./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsAuthorizationManager.java
- History
- Source
- Diff
./src/.../ExpensiveGoodsAuthorizationManager.java

10:21 上午

shuyongfu

More
22037
deleted 1 file
V4.1.0

由于小庄误提交,现删除

- ?
./.classpath
- History
- Source
- Diff
./.classpath

10:19 上午

shuyongfu

More
22036
deleted 1 file
V4.1.0

由于小庄误提交,现删除

./.settings/gradle
- History
- Source
- Diff
./.settings/gradle

ssts-expensivegoods

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)

yanweining

liuliben

jeffli

yanweining

shuyongfu

niutou_ren

niutou_ren

yanweining

jeffli

jeffli

jeffli

chenjiaru

jeffli

chenjiaru

jeffli

niutou_ren

chenjiaru

jeffli

yanweining

yanweining

niutou_ren

jeffli

jeffli

niutou_ren

yanweining

yanweining

yanweining

liuliben

shuyongfu

shuyongfu