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 03 May 2016
10:29 上午

wangyi

回收改造，去掉篮筐分组功能，增加按材料分类类型入筐功能
Options
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
    • -30
    • +6
    /ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/TousseIntoBasketRestrictionsTests.java
    • -6
    • +0
    /ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java
    • -0
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/container/containerGroupView.jsp
    • -27
    • +6
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/becleanitem/ClassifyBasket.java
    • -8
    • +15
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/action/MaterialDefinitionAction.java
    • -2
    • +0
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • -33
    • +5
    /ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/RecyclingMaterialsTest.java
    • -1
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/UntracableRecyclingApplicationAction.java
    • -1
    • +10
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/becleanitem/ClassifiedItem.java
    • -0
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/container/containerGroupView.js
    • -16
    • +0
    /ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml
    • -0
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css
    • -2
    • +0
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • -180
    • +213
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionForm.js
  16. … 32 more files in changeset.
Monday 02 May 2016
11:49 下午

shuyongfu

1.明细核算月报增加器械材料选项,选一次性物品、器械包等物品时,不查询材料的数据

2.结算管理功能调整

3.报表功能完善

Options
    • -12
    • +14
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/stocktakeView.js
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -0
    • +28
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
    • -2
    • +15
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js
6:50 下午

adairkang

一次性物品结算汇总分类过滤
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
6:12 下午

adairkang

no_comment
Options
    • -1
    • +1
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/MonthGoodsDetailSummaryService.java
    • -1
    • +1
    /ssts-web/src/main/webapp/jasperRtp/stocktakeSummaryReport.jrxml
2:33 上午

adairkang

统计汇总的新加列
Options
    • -7
    • +7
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/MonthGoodsDetailSummaryService.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
2:15 上午

adairkang

盘点列表打印

发货出库统计

Options
    • -2
    • +26
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/stocktakerecordmanager/MonthGoodsDetailVo.java
    • -30
    • +213
    /ssts-web/src/main/webapp/jasperRtp/stocktakeSummaryReport.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/stocktakeSummaryReport.jasper
    • -0
    • +27
    /ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/print/printConfig.js
    • -1
    • +6
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/MonthGoodsDetailSummaryService.java
1:13 上午

adairkang

盘盈盘亏的打印
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownStockTakeView.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/commonEntry.js
    • -5
    • +6
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GodownEntryTableManager.java
12:23 上午

adairkang

no_comment
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
Sunday 01 May 2016
11:59 下午

adairkang

盘盈盘亏打印
Options
    • -7
    • +13
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GodownEntryTableManager.java
    • -0
    • +57
    /ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/print/printConfig.js
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownStockTakeView.js
    • -0
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/commonEntry.js
    • too large
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
11:40 下午

adairkang

一次性物品盘盈盘亏报表
Options
    • -1
    • +195
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/stocktakerecordmanager/MonthGoodsDetailVo.java
    • -0
    • +186
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/MonthGoodsDetailSummaryService.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
1:57 上午

shuyongfu

1.新增一次性物品盘盈盘亏功能

2.调拨单按日期等条件查询功能完善

Options
    • -0
    • +49
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GodownEntryTableManager.java
    • -0
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/appropriationView.jsp
    • -0
    • +531
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownStockTakeView.js
    • -0
    • +81
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownStockTakeView.jsp
    • -0
    • +1
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
Friday 29 Apr 2016
4:43 下午

adairkang

中山市中医院的大标签及发货计划的打印

打印器械包标签时，可以配置一次性物品是否要打印

Options
    • -1
    • +10
    /ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js
    • -78
    • +61
    /ssts-web/src/main/webapp/disinfectsystem/config/zsszyy/print/printConfig.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/zsszyy/config.js
4:40 下午

adairkang

no_comment
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/debug/print/print.jsp
4:33 下午

cherry

update
Options
    • -1
    • +1
    /build.gradle
4:31 下午

adairkang

历史回收记录,日期过滤的界面,点击数字时报错的问题
Options
    • -0
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/selectRecyclingDate.jsp
3:43 下午

adairkang

金额的小数位数
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/print/print.js
3:32 下午

jeffli

解决bug：

回收历史记录选择时间范围的界面，低分辨率下没有自动缩放。

Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css
    • -1
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/selectRecyclingDate.jsp
3:22 下午

adairkang

材料打印小数位数的问题
Options
    • -0
    • +8
    /ssts-web/src/main/webapp/disinfectsystem/materialmanager/materialEntry.js
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/materialmanager/MaterialEntry.java
    • -0
    • +7
    /ssts-web/src/main/webapp/ext/js/common.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/config.js
    • -1
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/print/print.js
2:12 下午

adairkang

合计小数位数
Options
    • -1
    • +2
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialEntryManagerImpl.java
1:38 下午

shuyongfu

材料入库单增加删除功能、材料管理-添加与删除功能问题修复
Options
    • -2
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/materialmanager/materialEntryView.js
    • -49
    • +28
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialEntryManagerImpl.java
    • -8
    • +12
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/action/MaterialEntryAction.java
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionForm.js
    • -5
    • +10
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/action/MaterialDefinitionAction.java
12:48 下午

adairkang

自动处理一次性物品库存的定时器启动报错的处理
Options
    • -3
    • +2
    /ssts-web/src/main/resources/spring/projects/zsszyy/timer.xml
12:38 下午

adairkang

自动处理一次性物品库存的定时器启动报错的处理
Options
    • -1
    • +1
    /ssts-web/src/main/resources/spring/projects/zd5y/timer.xml
    • -2
    • +2
    /ssts-web/src/main/resources/spring/projects/zsszyy/timer.xml
    • -1
    • +1
    /ssts-web/src/main/resources/spring/projects/gd2zyy/timer.xml
    • -1
    • +1
    /ssts-web/src/main/resources/spring/projects/zsykzx/timer.xml
    • -1
    • +1
    /ssts-web/src/main/resources/spring/projects/sznsfy/timer.xml
    • -1
    • +1
    /ssts-web/src/main/resources/spring/projects/cszxyy/timer.xml
    • -1
    • +1
    /ssts-web/src/main/resources/spring/projects/dgjszx/timer.xml
    • -1
    • +1
    /ssts-web/src/main/resources/spring/projects/gdsy/timer.xml
    • -1
    • +1
    /ssts-web/src/main/resources/spring/projects/gdsfybjyy/timer.xml
    • -1
    • +1
    /ssts-web/src/main/resources/spring/projects/gyey/timer.xml
    • -1
    • +1
    /ssts-web/src/main/resources/spring/projects/jmrmyy/timer.xml
    • -1
    • +1
    /ssts-web/src/main/resources/spring/projects/gxzyyf1/timer.xml
    • -1
    • +1
    /ssts-web/src/main/resources/spring/projects/zsly/timer.xml
    • -1
    • +1
    /ssts-web/src/main/resources/spring/projects/gzzyyfs/timer.xml
Thursday 28 Apr 2016
6:25 下午

adairkang

添加pda的登录超时时间的设置
Options
    • -3
    • +3
    /ssts-web/src/main/webapp/personalSetting/modifyExitLoginTime.js
6:19 下午

adairkang

添加pda的登录超时时间的设置
Options
    • -0
    • +1
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -0
    • +30
    /ssts-web/src/main/webapp/personalSetting/modifyExitLoginTime.jsp
  3. /ssts-web/src/main/java/com/forgon/disinfectsystem/mobileClient
    • -0
    • +59
    /ssts-web/src/main/java/com/forgon/disinfectsystem/mobileClient/action/MobileClientSettingAction.java
    • -0
    • +90
    /ssts-web/src/main/webapp/personalSetting/modifyExitLoginTime.js
    • -0
    • +5
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/security/service/WebServiceManager.java
    • -0
    • +11
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/security/service/WebServiceManagerImpl.java
  8. /ssts-web/src/main/java/com/forgon/disinfectsystem/mobileClient/action
5:53 下午

jeffli

新增功能：

打开多个窗口时，如果切换了用户，或者切换了部门，其他界面会弹出刷新的提示。

Options
    • -0
    • +1
    /ssts-web/src/main/webapp/js/common.js
    • -5
    • +28
    /ssts-web/src/main/webapp/homepage/portalPage.jsp
    • -0
    • +1
    /ssts-web/src/main/webapp/WEB-INF/dwr.xml
    • -0
    • +5
    /forgon-core/src/main/java/com/forgon/portal/dwr/PortalDWRManager.java
    • -1
    • +1
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
5:13 下午

jeffli

no_comment
Options
  1. /ssts-web/src/main/webapp/thirdpartyAPP
5:03 下午

jeffli

KeyValueManager增加方法
Options
    • -1
    • +4
    /forgon-core/src/main/java/com/forgon/keyvalue/service/KeyValueManagerImpl.java
    • -0
    • +1
    /forgon-core/src/main/java/com/forgon/keyvalue/service/KeyValueManager.java
3:35 下午

jeffli

解决bug：

发货时发货明细没有记一次性物品相关的id

Options
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
2:29 下午

shuyongfu

科室供应室配置增加二级供应室是否自动发货,灭菌完成后判断如果二级供应室未配置是否自动发货时改为默认按原来机制处理,如果配置二级供应室是否自动发货不为否时调用自动发货,否则与一级供应室一样不处理
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
10:43 上午

shuyongfu

科室供应室配置增加二级供应室是否自动发货,灭菌完成后判断如果二级供应室未配置是否自动发货时改为默认按原来机制处理,如果配置二级供应室是否自动发货不为否时调用自动发货,否则与一级供应室一样不处理
Options
    • -0
    • +3
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
    • -4
    • +9
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
    • -0
    • +10
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java
    • -0
    • +29
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js