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

5:20 下午

liuliben

More
22326
changed 3 files
V4.1.0

修改高值耗材授权方法

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

4:48 下午

liuliben

More
22324
changed 3 files
V4.1.0

补充方法注释

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

3:28 下午

liuliben

More
22321
changed 4 files
V4.1.0

修复授权问题

- ?
./com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsAuthorizationAction.java
- History
- Source
- Diff
./com/.../ExpensiveGoodsAuthorizationAction.java
- ?
./com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsAuthorizationManager.java
- History
- Source
- Diff
./com/.../ExpensiveGoodsAuthorizationManager.java
- ?
./com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsAuthorizationManagerImpl.java
- History
- Source
- Diff
./com/.../ExpensiveGoodsAuthorizationManagerImpl.java
… 1 more file in changeset.

11:39 上午

niutou_ren

More
22313
changed 2 files
V4.1.0

调试：添加时间打印，寻找高值耗材保存慢的原因

- ?
./com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java
- History
- Source
- Diff
./com/.../ExpensiveGoodsManagerImpl.java
- ?
./com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsAction.java
- History
- Source
- Diff
./com/forgon/.../ExpensiveGoodsAction.java

11:21 上午

niutou_ren

More
22311
changed 1 file
V4.1.0

修复由于高值耗材供应商链中断时，导致的死循环

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

11:12 上午

yanweining

More
22309
changed 3 files
V4.1.0

高值耗材：高值耗材发票新建保存时添加发票号校验

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

9:22 下午

liuliben

More
22305
changed 4 files
V4.1.0

修改高值耗材授权界面

- ?
./com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsAuthorizationManagerImpl.java
- History
- Source
- Diff
./com/.../ExpensiveGoodsAuthorizationManagerImpl.java
- ?
./com/forgon/disinfectsystem/expensiveGoods/dwr/table/ExpensiveGoodsTableManager.java
- History
- Source
- Diff
./com/.../ExpensiveGoodsTableManager.java
… 2 more files in changeset.

4:24 下午

niutou_ren

More
22293
changed 4 files
V4.1.0

高值耗材定义bug修改

1、厂家宽度可以调大一些，保存后打开，厂家没显示出来（bug已修改，宽度也进行了调整）

2、高值耗材列表界面的名称、注册证宽度可以调大一些，名字长的显示不全（进行了调整）

3、点保存时间太久了（还没有进行）

4、供应商、经营许可证、授权方等，宽度不够（这个等下问一下周经理，位置不够……）

5、供应商的营业执照有效期显示不对，显示的是经营许可证的有效期。（已解决）

6、生产厂家的颜色预警也加上了（已解决）

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

3:12 下午

liuliben

More
22290
changed 7 files
V4.1.0

高值耗材授权界面调整

- ?
./com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsAuthorizationAction.java
- History
- Source
- Diff
./com/.../ExpensiveGoodsAuthorizationAction.java
- ?
./com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsAuthorizationManager.java
- History
- Source
- Diff
./com/.../ExpensiveGoodsAuthorizationManager.java
- ?
./com/forgon/disinfectsystem/expensiveGoods/dwr/table/ExpensiveGoodsTableManager.java
- History
- Source
- Diff
./com/.../ExpensiveGoodsTableManager.java
- ?
./com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsAuthorizationManagerImpl.java
- History
- Source
- Diff
./com/.../ExpensiveGoodsAuthorizationManagerImpl.java
… 3 more files in changeset.

10:52 上午

yanweining

More
22286
changed 2 files
V4.1.0

高值耗材：高值耗材获取型号定义方法修改

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

9:15 上午

niutou_ren

More
22283
changed 10 files
V4.1.0

高值耗材定义与库存修改

1、定义界面添加了供应商信息，对需要显示的列进行了调整，对定义界面的布局进行了调整；

2、库存界面添加了一些字段（哪些字段需要显示，哪些不要显示还需要推敲），同时增加了具体型号的库存显示。

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

8:44 下午

yanweining

More
22280
changed 15 files
V4.1.0

高值耗材：高值耗材发票警告

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

2:13 下午

yanweining

More
22271
changed 3 files
V4.1.0

高值耗材：高值耗材代码优化

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

11:38 上午

liuliben

More
22267
changed 2 files
V4.1.0

修改方法注释和删除不用的方法

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

11:04 上午

liuliben

More
22264
changed 3 files
V4.1.0

还原授权证添加验证方法

- ?
./com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsAuthorizationManagerImpl.java
- History
- Source
- Diff
./com/.../ExpensiveGoodsAuthorizationManagerImpl.java
- ?
./com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java
- History
- Source
- Diff
./com/.../ExpensiveGoodsManagerImpl.java
- ?
./com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsAuthorizationManager.java
- History
- Source
- Diff
./com/.../ExpensiveGoodsAuthorizationManager.java

7:14 下午

niutou_ren

More
22261
changed 1 file
V4.1.0

暂时注释掉由于嵌套引用manager导致的tomcat无法启动的代码

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

3:34 下午

niutou_ren

More
22257
changed 8 files
V4.1.0

高值耗材定义修改，添加供应商列表（此次提交，只有只后台实现）

- ?
./com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsAuthorizationManager.java
- History
- Source
- Diff
./com/.../ExpensiveGoodsAuthorizationManager.java
- ?
./com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java
- History
- Source
- Diff
./com/.../ExpensiveGoodsManagerImpl.java
- ?
./com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsAction.java
- History
- Source
- Diff
./com/forgon/.../ExpensiveGoodsAction.java
- ?
./com/forgon/disinfectsystem/expensiveGoods/dwr/table/ExpensiveGoodsTableManager.java
- History
- Source
- Diff
./com/.../ExpensiveGoodsTableManager.java
- ?
./com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsAuthorizationManagerImpl.java
- History
- Source
- Diff
./com/.../ExpensiveGoodsAuthorizationManagerImpl.java
- ?
./com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManager.java
- History
- Source
- Diff
./com/forgon/.../ExpensiveGoodsManager.java
… 2 more files in changeset.

10:19 上午

yanweining

More
22252
changed 18 files
V4.1.0

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

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

9:42 下午

liuliben

More
22193
changed 1 file
V4.1.0

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

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

2:46 下午

jeffli

More
22158
changed 6 files
V4.1.0

一键退库功能调整

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

10:25 上午

yanweining

More
22145
changed 1 file
V4.1.0

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

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

10:28 下午

shuyongfu

More
22143
changed 1 file
V4.1.0

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

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

9:52 下午

niutou_ren

More
22142
changed 1 file
V4.1.0

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

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

9:29 下午

niutou_ren

More
22141
changed 4 files
V4.1.0

1、修改错误的函数名

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

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

6:06 下午

yanweining

More
22136
changed 7 files
V4.1.0

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

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

5:49 下午

jeffli

More
22135
changed 1 file
V4.1.0

优化提示信息

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

5:37 下午

jeffli

More
22134
changed 2 files
V4.1.0

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

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

2:33 下午

jeffli

More
22129
changed 1 file
V4.1.0

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

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

11:38 上午

chenjiaru

More
22125
changed 2 files
V4.1.0

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

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

9:47 下午

jeffli

More
22118
changed 1 file
V4.1.0

修改一键退库bug

- ?
./com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
- History
- Source
- Diff
./com/.../ExpensiveGoodsGodownEntryManagerImpl.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)

liuliben

liuliben

liuliben

niutou_ren

niutou_ren

yanweining

liuliben

niutou_ren

liuliben

yanweining

niutou_ren

yanweining

yanweining

liuliben

liuliben

niutou_ren

niutou_ren

yanweining

liuliben

jeffli

yanweining

shuyongfu

niutou_ren

niutou_ren

yanweining

jeffli

jeffli

jeffli

chenjiaru

jeffli