forgon-ssts-v4.1.0

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 59
Total Committers: 60
Last Commit: 14 Feb 16
Commits this week: 59
Total Lines of Code (LoC): 4,711,364
Net change in LoC this week: 3,161

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

Subversion Details

1 property
  • svn:global-ignores = .gradle .settings bin build rebel.xml
  • last updated a few seconds ago
All Commits Reviews
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Tuesday 10 May 2016
2:23 下午

wangyi

触摸屏功能按包名称查询改成按id查询
Options
    • too large
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
    • -54
    • +41
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
    • -2
    • +1
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
    • -2
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.jsp
    • -6
    • +15
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • -2
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingDamage.jsp
    • -6
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • -3
    • +2
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • -4
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/disinfectionTousseItems.jsp
    • -5
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp
    • -0
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/container/Container.java
11:36 上午

jeffli

解决bug：

盘点记录查看时，只能查看到默认仓库的

Options
    • -3
    • +6
    /ssts-web/src/main/java/com/forgon/disinfectsystem/stocktakerecordmanager/dwr/table/StockTakeRecordTableManager.java
11:16 上午

jeffli

4.0升级4.1脚本更新。
Options
    • -1
    • +11
    /ssts-web/src/main/webapp/dataUpdater/4.0升级4.1脚本/配置一级供应室的器械包及服务临床脚本_oracle.sql
    • -0
    • +14
    /ssts-web/src/main/webapp/dataUpdater/4.0升级4.1脚本/配置一级供应室的器械包及服务临床脚本_sqlserver.sql
11:08 上午

jeffli

解决bug：

一个供应室有多个仓库时，其他仓库添加的盘点记录无法看到。

Options
    • -4
    • +5
    /ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/dwr/table/InventoryRecordTableManager.java
    • -8
    • +39
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManagerImpl.java
    • -1
    • +3
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManager.java
Monday 09 May 2016
11:20 下午

adairkang

外来器械包申请单处理科室为科室供应室设置里设置的外来器械包处理科室

自定义器械包可选择一级供应室或者二级供应室为处理科室

代理灭菌单和外部代理灭菌单的处理科室为当前登录用户的科室，并且列表按处理科室过滤

Options
    • -1
    • +2
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/dwr/table/ForeignProxyDisinfectionTableManager.java
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
    • -0
    • +2
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/action/ProxyDisinfectionAction.java
    • -0
    • +4
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/CustomRecyclingApplicationAction.java
    • -1
    • +3
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/dwr/table/ProxyDisinfectionTableManager.java
    • -0
    • +2
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java
    • -1
    • +60
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/customTousseForm.js
    • -0
    • +3
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/action/ForeignProxyDisinfectionAction.java
9:25 下午

jeffli

解决bug：

一次性物品盘点，盘亏，把一个账面非0数，改为0，提示库存不足

Options
    • -21
    • +47
    /ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/service/InventoryRecordManagerImpl.java
8:56 下午

wangyi

触摸屏回收根据器械包id查询器械包信息
Options
    • -10
    • +13
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • -6
    • +8
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp
    • -1
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp
    • -1
    • +6
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • -4
    • +13
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dwr/table/TousseDefinitionTableManager.java
7:16 下午

shuyongfu

供应室领用功能修复
Options
    • -8
    • +8
    /ssts-receiverecord/src/main/java/com/forgon/disinfectsystem/receiverecord/service/ReceiveRecordManagerImpl.java
7:11 下午

wangyi

材料定义非空验证
Options
    • -2
    • +4
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
7:00 下午

wangyi

申请单干预功能
Options
    • -25
    • +0
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/InvoicePlanAction.java
    • -1
    • +48
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
    • -0
    • +77
    /ssts-web/src/main/webapp/disinfectsystem/interfere/interfereGoodsApplicationView.jsp
    • -1
    • +2
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -0
    • +532
    /ssts-web/src/main/webapp/disinfectsystem/interfere/splitRecyclingApplicationView.js
    • -0
    • +257
    /ssts-web/src/main/webapp/disinfectsystem/interfere/interfereGoodsApplicationView.js
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • -0
    • +2
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
6:41 下午

adairkang

一次性物品导入格式
Options
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/importbasedata/diposable.xls
6:40 下午

adairkang

标签材料添加规格
Options
    • -3
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/zsszyy/print/printConfig.js
6:07 下午

adairkang

一次性物品导入
Options
    • too large
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
6:05 下午

adairkang

有无生物检测报告及有无发票和分类级别的检测
Options
    • -0
    • +21
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GodownEntryItem.java
6:02 下午

shuyongfu

器械包退货功能调整
Options
    • -2
    • +2
    /ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
5:31 下午

shuyongfu

供用室领用增加材料领用相关文件提交
Options
    • -35
    • +61
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/MaterialItem.java
4:38 下午

shuyongfu

供用室领用增加材料领用及物品小结等
Options
    • -0
    • +13
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/receiverecord/ReceiveRecord.java
4:38 下午

shuyongfu

供用室领用增加材料领用及物品小结等
Options
    • -2
    • +18
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/receiverecord/ReceiveRecordItem.java
    • -1
    • +105
    /ssts-receiverecord/src/main/java/com/forgon/disinfectsystem/receiverecord/service/ReceiveRecordManagerImpl.java
4:25 下午

jeffli

解决bug：

excel导入一次性物品入库单，无法在入库单界面看到

excel导入一次性物品入库单，入库单类型为null

Options
    • -1
    • +7
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GodownEntryTableManager.java
    • too large
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
3:28 下午

jeffli

no_comment
Options
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • -2
    • +2
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
3:16 下午

shuyongfu

v4.1代码:解决科室申请列表,选择申请单打印一次性物品能打印出敷料包的问题。另外已终止的物品将不再打印
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/print/printApplicationGoods.js
2:58 下午

shuyongfu

使用记录转申请单根据器械包处理科室及供应室服务临床科室生成对应的申请单
Options
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
2:11 下午

jeffli

优化功能：

修改发货界面的责任人文字提示，改为下送责任人

Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
11:44 上午

adairkang

缩进
Options
    • -12
    • +12
    /ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationForm.js
11:32 上午

shuyongfu

解决用一级供应室root用户填申请单,处理科室二级供应室,回头再用二级供应室用户进来看到的处理科室是一级供应室
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
11:14 上午

shuyongfu

删除注释
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
10:17 上午

jeffli

解决bug：

申请整包申请为否的消毒物品，没办法改变材料数量

Options
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • -1
    • +1
    /build.gradle
9:31 上午

shuyongfu

1.二级供应室发货代码移值到4.1

2.解决用一级供应室root用户填申请单,处理科室二级供应室,回头再用二级供应室用户进来看到的处理科室是一级供应室

3.器械包定义：处理科室改为优先处理科室

4.使用记录转申请单根据器械包处理科室及供应室服务临床科室生成对应的申请单

Options
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
    • -79
    • +55
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
9:14 上午

adairkang

中大五院申请单的打印，修改表格超出A4纸的宽度问题
Options
    • -6
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/config/zd5y/print/printConfig.js
Friday 06 May 2016
5:02 下午

jeffli

解决bug：

回收界面输入科室条码无法过滤

Options
    • -6
    • +27
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
    • -0
    • +2
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
    • -18
    • +1
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java