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

ssts-expensivegoods

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 11
Last Commit: 09 Nov 17
Commits this week: 0
Total Lines of Code (LoC): 0
Net change in LoC this week: 0

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading
  • last updated a few seconds ago
All Commits Reviews
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates

Changeset 22371 is being indexed.

Friday 02 Feb 2018
2:25 下午

chenjiaru

1、高值耗材申请单增加增删改查的权限

2、在BasePoManagerImpl.java增加log4j的写日志工具

Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
  2. … 4 more files in changeset.
1:59 下午

jeffli

使用记录扣减库存代码，解决bug和优化代码
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsStockManagerImpl.java
  2. … 2 more files in changeset.
10:55 上午

yanweining

高值耗材：高值耗材发票提示修改
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsBillManagerImpl.java
  3. … 3 more files in changeset.
Thursday 01 Feb 2018
11:36 下午

chenjiaru

高值耗材申请单入库验收之后产生外来器械包申请单功能的改造
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
8:11 下午

yanweining

高值耗材：高值耗材发票提示
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsBillManagerImpl.java
  2. … 1 more file in changeset.
7:26 下午

jeffli

高值耗材实例临床只能查看自己科室仓库的
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/dwr/table/ExpensiveGoodsTableManager.java
3:37 下午

liuliben

解决授权界面问题
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsAuthorizationAction.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManager.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsAction.java
  5. … 1 more file in changeset.
3:00 下午

niutou_ren

1、添加高值耗材时，增加注册证判断。一个注册证只能关联一个高值耗材定义

2、高值耗材定义界面，增加生产厂家列。

Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsAction.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManager.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java
  4. … 2 more files in changeset.
2:24 下午

yanweining

高值耗材：高值耗材发票明细添加生产厂家字段，页面修改
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsBillAction.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/dwr/table/ExpensiveGoodsGodownEntryTableManager.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsBillManagerImpl.java
  4. … 7 more files in changeset.
11:23 上午

niutou_ren

恢复高值耗材combo的查询语句（原查询语句是原生sql，不能用对象关联的方式来写）
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java
Wednesday 31 Jan 2018
11:13 下午

niutou_ren

1、修改高值耗材库存bug（增加仓库id的筛选条件）

2、调整高值耗材实例、库存界面字段显示宽度

3、修改高值耗材字段，添加一个注册证对象（修改相应代码）

Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/dwr/table/ExpensiveGoodsTableManager.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsAuthorizationManagerImpl.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManager.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsAction.java
  7. … 14 more files in changeset.
5:20 下午

liuliben

修改高值耗材授权方法
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsAuthorizationManagerImpl.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsAuthorizationAction.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsAuthorizationManager.java
4:48 下午

liuliben

补充方法注释
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsAuthorizationManagerImpl.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsAuthorizationAction.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsAuthorizationManager.java
3:28 下午

liuliben

修复授权问题
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsAuthorizationAction.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsAuthorizationManager.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsAuthorizationManagerImpl.java
  4. … 1 more file in changeset.
11:39 上午

niutou_ren

调试： 添加时间打印，寻找高值耗材保存慢的原因
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsAction.java
11:21 上午

niutou_ren

修复由于高值耗材供应商链中断时，导致的死循环
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java
11:12 上午

yanweining

高值耗材：高值耗材发票新建保存时添加发票号校验
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsBillManagerImpl.java
  2. … 2 more files in changeset.
Tuesday 30 Jan 2018
9:22 下午

liuliben

修改高值耗材授权界面
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsAuthorizationManagerImpl.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/dwr/table/ExpensiveGoodsTableManager.java
  3. … 2 more files in changeset.
4:24 下午

niutou_ren

高值耗材定义bug修改

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

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

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

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

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

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

Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsAction.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java
  3. … 2 more files in changeset.
3:12 下午

liuliben

高值耗材授权界面调整
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsAuthorizationAction.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsAuthorizationManager.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/dwr/table/ExpensiveGoodsTableManager.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsAuthorizationManagerImpl.java
  5. … 3 more files in changeset.
10:52 上午

yanweining

高值耗材：高值耗材获取型号定义方法修改
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsAction.java
  2. … 1 more file in changeset.
9:15 上午

niutou_ren

高值耗材定义与库存修改

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

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

Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManager.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsAction.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java
  4. … 7 more files in changeset.
Monday 29 Jan 2018
8:44 下午

yanweining

高值耗材：高值耗材发票警告
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsBillAction.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsBillManager.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsBillManagerImpl.java
  4. … 12 more files in changeset.
2:13 下午

yanweining

高值耗材：高值耗材代码优化
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsGodownEntryAction.java
  2. … 2 more files in changeset.
11:38 上午

liuliben

修改方法注释和删除不用的方法
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsAuthorizationManagerImpl.java
  2. … 1 more file in changeset.
11:04 上午

liuliben

还原授权证添加验证方法
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsAuthorizationManagerImpl.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsAuthorizationManager.java
Friday 26 Jan 2018
7:14 下午

niutou_ren

暂时注释掉由于嵌套引用manager导致的tomcat无法启动的代码
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java
3:34 下午

niutou_ren

高值耗材定义修改，添加供应商列表（此次提交，只有只后台实现）
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsAuthorizationManager.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsAction.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/dwr/table/ExpensiveGoodsTableManager.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsAuthorizationManagerImpl.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManager.java
  7. … 2 more files in changeset.
10:19 上午

yanweining

高值耗材：高值耗材入库，发票修改
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/util/ExpensiveGoodsGodownEntryUtil.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsGodownEntryAction.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsBillAction.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManager.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsBillManagerImpl.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
  7. … 12 more files in changeset.
Monday 22 Jan 2018
9:42 下午

liuliben

修改高值耗材授权同级别代理一件物品不能给多个下级代理授权
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsAuthorizationManagerImpl.java